Issue 210
Merge pull request #247 from AndreiH/issue_210

Issue 210