Feature/issue 4

request to merge issue 4 into master