fixes #11
merged master