Added basic registration. Issue #20