Fixes #21.
Fixes #22.
Merge pull request #23 from shepherds/init

Fixes 21, 22.