Merge pull request #2 from asip/master

Update to v0.10.4