Further refactoring
Merge branch 'master' of https://github.com/DziNeIT/skyprint