Merge pull request #8 from lluj/devel

Devel
Merge pull request #9 from paulnicholas/master

testing on example 00