Merge branch 'master' into joey7
Merge pull request #13 from draycox/joey7

Merge branch 'master' into joey7