Added stuff. fixes #1