floodyberry Merge pull request #3 from paulharris/master