Fix initial register bugs
Merge pull request #15 from yamanetoshi/Issue#12

Fix initial register bugs