Merge pull request #9 from ghuitster/master

David got started!