Merge pull request #78 from chipdude/master

optional<> a la N3672