michaeljsmith Merge pull request #17 from wsdjeg/master