Minor simulator change: Added maximum simtime and tab logging
Merged Agent with master