Fixed issue #6

Alan, Matt and I fixed issue #6