Another attempt to solve issue #173

Thanks for @PragTob's work, all specs passed on my Windows 7. Let me check what Travis CI says.