cleaned
Merge branch 'master' of https://github.com/itheof/FdF
better lines