Merge pull request #1 from karlkumbier/master

simulation changes
Some generalization of the simulation code
Oops, fixed a bug
Analyze a very simple simulation
Simulations working nicely
tested some slightly more complicated simulations