Merge branch 'master' into ChillMan
Merge pull request #24 from charlesboes/ChillMan

Merge branch 'master' into ChillMan