Merge pull request #30 from reillysiemens/master

Use dirname instead of basename. Differentiate between mv and ln.