resolved all problem

Closes #15 (closed)

added 3 commits

• 82fca91e...66543b1f - 2 commits from branch master
• 64165d7a - Merge branch 'master' into '15-update-resolve-problem'

Compare with previous version

merged

mentioned in commit 995f6bfb