Version 0.6

Ny design