Update to version 1

fixes #1
fixes #2
fixes #3