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

Implementing APPM-71.