Patch 2

Filip,

I hope I did it right this time...Here's my pull request.

Caleb