Fix for issue25
Merge pull request #3 from sharkannon/issue25

Fix for issue25