Updated for version 1.5.0