Merge pull request #353 from annando/master