Refactored
Release 1.7.2