Merging in updates for 0.1.1 release