Feature/issue 3

closes #3