Finish first version

// bug report alwasy welcome \\