Merge pull request #8 from SudoQ/develop

Should be up to date now
Merge branch 'master' into develop