mathiascreutz
Minor modifications
25f6c59