Merging changes from origin

Merged Andrew's changes from April 2013.