Version 1.0

Last little fixes