Fix for issue #272
Merge pull request #280 from rkowalick/issue272

Pull Request for Issue #272