Merge pull request #613 from nicobn/master