Improve init. Fixes #693
Merge pull request #763 from MrDHat/improve-init

Improve init. Fixes #693