updates for 2014-01-16
Merge branch 'louisxiv-1'