Fix #17, #14, #3, and update to v1.1.0-beta