retrodaredevil Merge pull request #3 from gurustave/master