Added debugging / Fixes #1