Merge pull request #3 from mattybeam/master

Simulate data, 1st Try
Minor changes and comments
Merge pull request #4 from CY-Chan/master

Cleanup of SimData