Free seats fix various changes
Merge branch 'master' of https://github.com/InformatriX/informatrix