Merge pull request #13 from antry2/master

Donezo
Soooo Happy
Merge pull request #1 from ehaydenr/master

whatever you want