some bugs
pull&merge
merge conflict on laptop
source readme