Started bugfix #691
Finished bugfix #691
Small azura's star fix
Bugfix #691 changes
Minor fix
Second minor fix
Third minor fix
Fourth minor fix
Fifth minor fix
Sixth minor fix
Merge remote-tracking branch 'glorf/bugfix'