update history module 07-26-14
Merge remote-tracking branch 'origin/master'