Merge pull request #1 from ljo/master

Ant build process and documentation changes