Merge pull request #257 from alexmv/master