1/3/2013 Merged branch 1.0 to master
12/23/2013 Merged branch 1.0 to master