bug fix
Merge pull request #60 from mshella/master

bug fix