Merge pull request #47 from hexagon5un/master