Updates on 5/18/2014
Merge remote-tracking branch 'origin/master'