Merge pull request #4 from paginagmbh/master

Several small fixes