PR for issue #38

Fixes issue #38?
Merge pull request #39 from aalexandrov/patch-2

PR for issue #38