consistency between the two demos. Demo 2 also provided with comments
removed commented parameters
added doc