Merge remote-tracking branch 'origin/master' into Dani
stage 1 framwork for de/encryption
new build-file (merged from master)