Merge pull request #12 from johns996/master

Branch Sync
Merge pull request #13 from johns996/dev-eric

Merge pull request #12 from johns996/master