Changes integrated into Simba executable

closes #10