Updated for version 0.99