added documentation
fixed conflict
added license
version 0.2