merged pull request #126
merged pull request #121
merged pull request #114