Updated for tag 0.1.1