Merge pull request #257 from rene-dev/master