Fix GCC 4.9 build errors
Merge pull request #4 from undingen/master

Fix GCC 4.9 build errors