Organize functions, add deterministic addresses
Merge pull request #3 from bitstein/master

Organize functions, add deterministic addresses