Fixes #154
merge with origin