Commit 1
Merge branch 'master' of https://github.com/S-Ashida/filtrar.2014a