fixes #16
Merge branch '#16'