Merge branch 'master' of https://github.com/v-zmiycharov/hirundo into v-zmiycharov-master