Modified a few methods
Merge branch 'master' of https://github.com/mikaelvg/bayanihan