Merge pull request #131 from adamarla/master

Registration
Merge remote-tracking branch 'upstream/master'