Added some features that I (@dpp) would like
Merge pull request #1 from dpp/master

Added some features that I (@dpp) would like