smaller pull request
revised
merged master