Ubuntu 13.04 compilation Fixes
Merge pull request #1 from tedr56/master

Ubuntu 13.04 compilation Fixes