Changes from local repos
Merge pull request #1 from Nexusger/master

Changes from local repos