Merge pull request #3 from nriesterer/master

Cross-platform conformity & c++11 compatibility