Feature/type

#6