FIX: Fix examples
Merge pull request #349 from Eric89GXL/fix-exs

FIX: Fix and reorganize examples