Merge pull request #3 from michaeltirenin/master

Printline conflict
Jeff Conflict
update conflict