Added test for issue #33
Merge branch '0.5.1' of https://github.com/g-truc/gli into 0.5.1
Fixed interaction with std::map (#33)