0.5.1
Added type flag