Merge pull request #8 from pushchris/master

Feature additions