closes milestone 0.0.5

Signed-off-by: Alexander Skjolden <alex@plastboks.net>