Advent 2014-12-14 rumidier draft
Merge pull request #75 from seoulpm/rumidier-20141214-draft

Advent 2014-12-14 rumidier draft