Minor fixes
Merge branch 'master' of https://github.com/assemblio/project-nastradin