Closes ticket #33