WIP
finish prototype
fix bug
Merge pull request #3 from phariel/v1

V1