Fix
Merge branch 'next' of github.com:zhdk/madek into next