Merge pull request #7 from Breeze/development/zza

Development/zza with latest server refactorings