PUMA fixed hopefully
Merge branch 'master' of https://github.com/binx/Health-Atlas
various updates