Merge pull request #1 from markthema3/master

Sync
Merge pull request #2 from markthema3/why-is-it-broken

Merge pull request #1 from markthema3/master