Merge and resolve conflicts of SimBen
Merge pull request #8 from uCtrl/simMerge

Merge and resolve conflicts of SimBen