newest update 11/15/2014 2:25
Merge origin/master