Changes integrated into Simba executable
Merge pull request #13 from sharrington93/master

Changes integrated into Simba executable