Address issues with namespacing. Bump to 0.3.1