I've updated my branch fixing the order for those 2, you can pull again.