Merge pull request #1 from Cyphur/dev

Dev
Merge branch 'master' into dev