Merging Simple-form branch