Update 0.3

Big update, lot of changes