fixes #18
Merge branch '#18'