Check validity
Merge branch 'master' of github.com:jangel88/gampi