bug fixed
Merge pull request #26 from miller/master

bug fixed