Fix for issue #28
Another small improvement for issue #28
Merge pull request #10 from soygul/master

Pull to Master