Merge pull request #31 from jeff5665/master

Merge branch 'allenjohn-master'
Merge pull request #32 from jeff5665/allen_master

Merge pull request #31 from jeff5665/master