Merge pull request #1 from Bistalock/master

Synchronized commits
Merge pull request #2 from Poognaka/master

Merge pull request #2 from Bistalock/master