2nd branch commit
3rd pull request fixes
committed