Updated for 0.0.2.1 and better docs