closes#13
Merge branch 'origin/#6-GOL'