Changes for Ubuntu Utopic 14.10
Merge pull request #37 from arky/master

Changes for Ubuntu Utopic 14.10