fix for c++11
Fix for issue #15
Merge pull request #14 from OJFord/master

Fixed: #13 (C++11)
Fixed: #15 (test name warning)