Merge pull request #154 from jix/sby_design-fixes