Merge pull request #14 from gberton/master

more edits
link