Merge pull request #1 from jvrunion/master

Syncing updates
Merge pull request #2 from orionstein/master

Merge pull request #1 from jvrunion/master