Merge pull request #19 from Firefishy/master