Issue/6

It solves both #5 and #6 issues.