Update to 0.20beta

- Few bug fixes submitted by mokhdzanifaeq