Issue 14

fixes #14