added license header, improved docs
fixed conflict