Merge pull request #1 from netmanagers/master

Added extra options to the template and fixed specs
Merge remote-tracking branch 'upstream/master'