Updated to version 0.2