Fixed logger message
Calling replaceReference() in proper places
Added Command Line Interface