[FIX] issue #54
Merge pull request #55 from Orkin/master

[FIX] issue #54