Added windows and clean targets
Updated to recent v7