Merge pull requests, update to 0.1.2