Merge pull request #1 from slaughterjames/master

Pulling latest changes...