Merge pull request #17 from timsifive/debug