Merge pull request #87 from annando/master