Merge pull request #24 from rushmin/master

Fixing APPM-74