Updated to version 0.1.6-alpha