Added more features, will break code
Merge pull request #3 from christopherobin/master

Added more features, will break code