Merge pull request #1 from murrekatt/master

Building with -std=c++11 and added missing includes.