renaming, tidying
Merge pull request #3 from kolektiv/develop

renaming, tidying