Added additional functionality and cleaned up a lot of extra stuff.
Merge pull request #8 from rossmcdonald/master

Added additional functionality and cleaned up a lot of extra stuff.