Implementing APPM-23
Merge pull request #16 from rushmin/master

Implementing APPM-23