Merge pull request #233 from wagnert/master

Refactoring to work with new directory structure provided with appserver...
Merge pull request #234 from wagnert/master

Actualize CHANGELOG.md