Merge with devBranch (adds openSsl support)