tmilos Merge pull request #73 from Webmecanik/master