Add various improvements and replaced the default example
Merge pull request #7 from aboudreault/various-fixes

Add various improvements and replaced the default example