The changes have been made and pushed to kaneplusplus:master.