Merge pull request #3 from meistero/master

PyOP2 branch