Merge pull request #1 from jvrunion/master

Syncing updates