updated 2012 to 2013
Merge branch 'master' into steveG