committing everything
Merge pull request #1 from rolandzwaga/develop

all my changes so far as one pull request