merage
Merge branch 'allenjohn-master'
bug fix
Merge pull request #31 from jeff5665/master

Merge branch 'allenjohn-master'