Set for 2013 Version

Leaving the master as set for the 2013 version, ready to fork for 2014