various updates
Merge branch 'master' of github.com:jay0lee/GAM