Test
Bug fix
Merge branch '1.0.0'