Merge pull request #1 from yearbookmachine/master

pull additions