Added Junit 4 test, Slf4j logger, new features and error management
Merging dev into master