Merge pull request #12 from ldurazo/master

None or very small bugs on the app now.