Merge 10-7-2013

Merging like Ken asked