Update to 0.1.4-dev

**NOT... READY... FOR... MERGE!!!**