Merge pull request #680 from sheebans/master

Fixed build error
Fixed the form url content type support