Merge pull request #1 from josemmsimo/default

Pull Monday 2014.02.03
Merge pull request #2 from josemmsimo/master

Merge pull request #1 from josemmsimo/default