Merge pull request #6 from orefalo/devel