I am not sure, but I think, that this commit fix #5, close #6, resolve #7