Merge pull request #300 from elvisfox/master