Merge branch 'master' of https://github.com/lisek1/siemano.git