Merge branch 'master' into develop
Fixing omitted Debian 7 definition

For #15
Merge branch 'develop'