Merge pull request #116 from ChrisBoesch/master

Updates
minor edit to check for registration #2
Merge pull request #369 from ShaikDawood/master

minor edit to check for registration bug #2