finished issue #4. Added in place as well as name. Since they are not always the same thing.
Merge pull request #20 from mrpenguinman/master

Pull request to merge in changes for issue #4