Cleaned up a lot of code
Merge branch 'master' of github.com:ethro/jocadoet
test