Bugfix
Merge branch 'bootstrap' of github.com:TheBB/aligulac into bootstrap