Merge pull request #6 from christianbourgeois/master

Work in Progress