Merge pull request #18 from Zookal/master

Refactorings, updates
changed email and homepage information