Merge pull request #16 from valentinewallace/update-to-0.98