Initial commit. Fixes #1