* a factor is missing, but it seems to have minor influence to resutls
Merge remote-tracking branch 'contactangle/contactangle' into contactangle