Fix things up - now builds and tests successfully
Remove debugging line
Merge pull request #1 from retupmoca/master

Fix things up - now builds and tests successfully