move to v1 from upstream
Merge pull request #37 from snyff/move_to_v1

move to v1 from upstream