Fixed registration. closed #12