New stuff in new branch
Merge pull request #1 from xjaros1/development

New stuff in new branch