Bugfixes with patterns
Merge branch 'master' of github.com:chrismcmacken/phptools