bug fix
Merge pull request #323 from astern7/master

bug fix