Merge pull request #17 from viperchris3/work

Fixed bug with unregister