finish prototype
Merge pull request #2 from phariel/master

finish prototype