Updated to 0.21a

Added changes from 0.20a to 0.21a