Feature/3

merge master in develop and fixes #3