Making my first commit
Doing It again
Merge pull request #1 from bitsaman/master

I am merging this for now, but it still has issues. We will talk more about it.