drahosp Merge pull request #2 from ntavish/master