Allow options hash instead of namespace, fix bugs
1.0.0