Merge pull request #20 from ljo/master

Ant build process changes