Merge pull request #20 from h110hawk/development

SSL support merged into development