Adds changes to master for future 0.1.4 release