issue #1
issue #1 - refactored
issue #1 - notes done
issue #1 - notes done
issue #1 - notes done
issue #2 and #3
fix merge issue
fix merge issue
fix conflicts
refactored stats functions and add stats test
Merge pull request #9 from edionmelarosa/master

issue #2