Issue #17
working version