Merge pull request #3 from CY-Chan/master

Make up to date with Johnny's
Simulate Data, 1st Try
Merge pull request #3 from mattybeam/master

Simulate data, 1st Try