Initial commit to solve issue 149
Fixes #149
Merge pull request #179 from jacksonchen/issue_149

Solves Issue 149