V1.1

fixes #2 #4