added simulate branch
Merge pull request #1 from NikiMaslarski/simulate

added simulate branch