Merge pull request #1 from clintwiley/module0

Module0
Merge branch 'module0'

* module0:
  new tests
Merge branch 'master' into module0

* master: