jessespears Merge pull request #26 from FlxPeters/master