Merge pull request #86 from HaToHo/master

Added certificate generation
Merge remote-tracking branch 'upstream/master'
Removed imports.