Merge pull request #19 from olerem/dbg