Issue 1

fixes #1
Please review.