adding Jin
merged changes
Merge branch 'master' of github.com:chasm/symbiote