fix for APPM-46
Merge pull request #16 from rushmin/master

Implementing APPM-23