Made the majority of the suggested changes.
Merge pull request #14 from anindyabd/master

Made the majority of the suggested changes.