Updated master to 0.1.4