Clean up of module dependencies.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Closes #18.