Merge pull request #230 from djtye/master