[Testing] Some new Features for Testing
Merge branch 'develop' of https://github.com/HPerin/Nattubras-Java into develop