Updated for 0.1.2 beta release