Pull request for issue #133

hope I did this right!