More consistent naming + some refactorings #1
added better messaging + fixed a possible bug
Merge branch 'master' of https://github.com/jole78/wdp