Merge pull request #66 from lergo/lergo-171-third-commit

lergo-171-third commit
lergo-107-fourth-commit
Merge pull request #67 from lergo/lergo-171-third-commit

lergo-107-fourth-commit
Merge branch 'develop' of local repository into lergo-171-third-commit