update lib 01/17/2014
Merge remote-tracking branch 'origin/master'