Roll version and fix #50
Fix #13