Post-review changes according to Monty's review from 28/11/2012.
Attach a file by drag & drop or click to upload
