Updated to version 0.1.8