Clean-up.
Merge branch 'dev' of https://github.com/NiamNiam/NiamServices into dev