Merge pull request #4 from kesapojat/master

More specific naming conventions
Fix link