Fixes #56: All required changes done