Changed safe place default to null - Closes #224
Checked all imports - Closes #200