Merge pull request #298 from danvine/master