Merge branch 'ianstarz-master'
Merge pull request #4 from uberdwang/master

Merge branch 'ianstarz-master'