Merge pull request #2 from cesoriano/master

Merge
Analysis 3.0
Merge pull request #14 from aydee/master

Analysis 3.0