Merge of Pull Request #136 Issue #136
rebuild for Pull Request #136