Adding some modules
Merge remote-tracking branch 'refs/remotes/github/master'