Fixes for Ubuntu 14.04
Merge pull request #6 from stopiccot/1404

Fixes for Ubuntu 14.04