#125 supports remote and local version
Merge pull request #126 from bittion/feature/iss125

#125 supports remote and local version