partial refactoring
Merge branch 'master' of github.com:steveoro/goggles
partial refactoring part 2
Merge branch 'master' of github.com:steveoro/goggles
major refactoring & specs update, part 3