Merge pull request #22 from SpeedProg/master