Updated to 1.1

Fixes #1, #2 & #3