Merge pull request #10 from soul2zimate/master

update accord with pull-shared refactoring