Merge pull request #35 from Hasimir/master

Licensing and flag additions
Merge pull request #36 from Hasimir/master

More tweaks