Work in progress
Merge branch 'master' of github.com:nick32m/emp-members-client