davidedelpapa Merge pull request #26 from funblaster22/master