Pull request to merge in changes for issue #4

Added place as well as name