updates for 2015
Merge pull request #1 from sebastianovide/development

updates for 2015