Updated the code to 0.5.0-Snapshot