Refactoring: replacing boolean by Enums
Start working on Counter types
Merge branch 'master' of https://github.com/simcap/Achilles