Merge pull request #2 from Bistalock/master

Synchronized commits