Fix for issue 23
Merge pull request #24 from rmcgibbo/issue-23

Fix for issue #23