more updates!
Merge pull request #15 from cegaudet/patch-7

more updates!