Manual merge of @mtub pull request  #152