fixed an issue with constructing non-trivials
Merge branch 'master' of github.com:dleslie/maybe-hpp