Merge pull request #2 from seba--/master

adapt to new Sugar* architecture