Interim commit
Merge branch 'alpha' of github:Advael/gannicus into alpha