credits keyline
Merge pull request #10 from KPlanche/master

credits keyline edits