Merge pull request #31 from pioneerit/dev

hw n.2
Merge branch 'master' into dev