Fix to make develop stable. Hack until Divij gets his init in.
Merge pull request #46 from jivid/temp_registry_hack

Fix to make develop stable until Divij gets his init in.