phracek Merge pull request #36 from sclorg/issue_35