Merge pull request #9 from janm399/master

Better naming