Merge pull request #293 from butlern/master