To answer you question with a few words: Yes you may do both, as long as you publish the changes you've done to Andorra 2D itself.