merge development branch

rubocop > houndci. Feel free to just use that.