pysim.git branch fairwaves/sim updated. 5dfda9fdd7856a99c031dcefec12dc6f4fecd5f9