Merge pull request #20 from olerem/dbg