Crinkles 2013-05-23 ##1,2,5,6

(this request to correct branch)