Merge branch 'hotfix/directory_gap'
Merge branch 'release/0.1.15'
Adding proxy support
Merge branch 'anigop-master' into feature/#10
Merge branch 'feature/#10' into develop