Done for today

I finished what I could
Done for today

Done for now
Merge pull request #7 from UberLame/master

Done for today