performance optimization 04
Merge branch 'master' of github.com:mikaelvg/bayanihan