Changes for input source and destination.
Merge branch 'master' of https://github.com/corile/Hackathon