Updates for justin
Merge pull request #1 from chasen/master

Updates for justin