implemented new scalebreaker, some fixes
Merge pull request #6 from filipnaumovic/develop

implemented new scalebreaker, some fixes