Updated for version 0.1.8