Feature/issue#12