Changed "use" in template to "import"
Merge remote-tracking branch 'origin/master'