Merge pull request #1 from Bistalock/master

Synchronized commits