Initial commit
fix merge conflicts
license removed, we cannot claim gpl v2 here