Change in design.

Signed-off-by: Rikard Johansson <rillee.johansson@gmail.com>
Merge branch 'master' of https://github.com/Malow/NotDeadYet