Schema updated after issue # 27
Merge branch 'master' into Juan
Merge pull request #29 from juanlizarazo/Juan

Schema updated after issue # 26