Fix issues + summary
Merge pull request #8 from ahcorde/master

Fix issues + summary