Merge pull request #339 from sabracrolleton/master