Updated module.
Updated module.
It's 2014 baby!
Merge remote-tracking branch 'origin/master' into fix-warnings