Refractoring
Merge branch 'master' of https://github.com/syhc/Giberson-et-al.