planning issue solved
merge conflict solved
small issue solved
Merge pull request #5 from santosj/master

solved small issues