Merge pull request #1 from chives/master

Initial version of code