Merge pull request #86 from seezer/c++11