Improved code quality
Merge branch 'develop' of github.com:klocussol/vagabonder into develop