Merge pull request #22 from chrisguindon/cguindon/master/fossdem21