Iss1

Fixes #1