Issue #60 + fixed errors