Merge pull request #3 from slaughterjames/master

Pulling latest changes...