Fix compile errors on Ubuntu 13.10
Merge pull request #1 from rodebiet/master

Fix compile errors on Ubuntu 13.10