Merge branch 'master' of https://github.com/chrisjluc/Nibbble
Merge branch 'master' into dev