pull and merge
Merge branch 'master' of github.com:mikaelvg/bayanihan
updated automated test