Update to fix location param and required params #3
Merge branch 'master' into merged-fixes