Updated for tag 0.0.5