new implementation + bugfix
fix default settings values