Updated to version 0.2.1-alpha