Bug Fixes
Merge remote-tracking branch 'myrepo/master'
With great power comes great responsibilities...