bug fix 7 done
Merge pull request #5 from mcassady/bug/bug_fix_7_49592629

Merged pull request #5