MODIFY: Location is set to optional in all forms earlier it was mandatory
Merge branch 'master' of https://github.com/techboy-/ncc