Updated for new version 1.0.1