Cleaning code. Starting to use modules
Merge branch 'master' of github.com:jbfavre/twumpio