Merge pull request #11 from jonatkins/master

Pull from upstream.