null check - fixes #584
small refactor - just put the layout constraints in their own method
nuspec changes - 3.1.1 - non-beta