Added a little more.
Merge pull request #41 from WClement/master

Added a little more.