Pre-release. Also fixed #102 and #110