Development - Merge latest development branch for Issues #46 and #47

Group fixes and SSL connection.