Add Daniel's updates to main repo (release 0.2)