update dev
Merge pull request #1 from daids/dev

update dev