Feature/issue#2