double registration check
Merge pull request #25 from dotch/master

double registration check