wycats Merge pull request #1 from colemickens/master