Package file name.
C++11 conversion
Merge pull request #6 from PetterS/cpp11

C++ 11 updates