working on issues - fixes #3

blabla