Merge pull request #11 from ldurazo/master

There are none or very small bugs on my app now.