1.0.0 stable branch
Some fixes