Merge pull request #11 from brianadamsdesigns/bbalentine

Bbalentine
Merge branch 'master' into bbalentine