1.0

Please merge