Fixes #4
Main interfase has changed