defaultsTo conditions fix
Merge pull request #106 from acies/develop

defaultsTo conditions