All done for now

All done for now
Merge pull request #10 from UberLame/master

All done for now