Implement pull request 22 from sinjax