Merge pull request #44 from SpeedProg/master