Merge pull request #3 from starverte/development

Development
Merge pull request #4 from starverte/development

Development
Merge pull request #5 from starverte/master

Development