--run implemented for command-line + test issue 500
Merge pull request #568 from georgebyelas/master

--run implemented for command-line + test; issue 500; also removed erroneously added templates