Some internal updates work
Merge pull request #16 from box/internal_updates

Some internal updates work