Merge pull request #1 from aenario/master

wip
Merge remote-tracking branch 'cozy/master'