refactoring
Merge branch 'master' of github.com:castamir/GAL-project