Closes  NERDZIlla issue #52