Fix #17, prepare for release