emhoracek Merge pull request #59 from dbp/master …