Completed some features and fixed some issues, more info can be found at the Issues section.
Merge pull request #22 from jayminshah/master

Completed some features and fixed some issues, more info can be found at the Issues section.