fix for issue #28
Merge pull request #123 from kwaledesign/dev

fix for issue #28