All commits to the moment from PR #120, #123