Updated for 2013.9.2
Improvements to 2013.9.1, now 2013.9.2