Merge pull request #40 from lawinslow/master

Fixed a bunch of feature requests and bugs
Merge pull request #41 from lawinslow/master

Addressing a few more issues.
Merge remote-tracking branch 'upstream/master'