Fixing remote file issue
Fixing issue 10
Merge remote-tracking branch 'origin/dev'