applied fixes for issue 45
Merge pull request #58 from kwaledesign/dev

applied fixes for issue #45