Fixed issue 28
Merge pull request #29 from nightrune/issue_28

Fixed issue 28