Issue 17

closed #17