fixes #27
merge