Fixed som bugs
Merge branch 'prototype' of https://github.com/henkelund/memobox into prototype