Fixes #23. Implement better constructor behaviour.