Merge pull request #92 from hardcpp/master