Merge pull request #3 from meistero/master

PyOP2 branch
Merge pull request #4 from meistero/PyOP2

Merge pull request #3 from meistero/master