fixes #14
merge master