Merged files to 0.6.0