Merge pull request #25 from Kronuz/development

Development branch synced