Fix issue 176
Merge pull request #198 from timothycrosley/feature/fix-issue-176

Fix issue 176