Merge pull request #141 from geekwright/master

Several overlapping changes
Update README.md
Update README.md
Update README.md
split tests with an AND + fix some errors
Merge pull request #144 from alain91/master

split tests with an AND + fix some errors
Small updates to Xmf

template renames, PSR-2 changes
Actually works again
Merge remote-tracking branch 'upstream/master'