Done! :) Also squashed the two commits together.