Issue 46

Pushed 558c9c213852de9b442a4a7f542408c3c8194a45 to the branch, as agreed.