Merge pull request #1 from dragonzone/master

Pulling latest changes from main project