Quick fix
More debugging
Merge pull request #24 from bstascavage/devel

Devel