update do new Sugar* architecture
Merge remote-tracking branch 'bob/master'
Merge pull request #2 from seba--/master

adapt to new Sugar* architecture