VAT calc fix
Merge branch 'master' of https://github.com/miina/swgsid.git