Merge pull request #1 from jdfreder/master

No more yaml