Needs finishing
Merge pull request #7 from EchoAce/replace

Needs finishing