Updated to version 0.0.7