Merge pull request #1 from JustinAzoff/master

pull up to justin's most recent commits