Updated to version 0.3.1-alpha