ubuntu 14.04 compilation fix
Merge pull request #69 from twiniars/master

ubuntu 14.04 compilation fix