Nat develop

Please rebase your branch on develop - your changes will overwrite install_requires