Merge pull request #67 from antis81/refactor/cpp0x-compatibility