rename of template + comments
debugging print removed
Merge remote-tracking branch 'origin/master'
added simulator tester