Merge pull request #4 from hildjj/master

several changes