Merge pull request #613 from rubenk/master