some refactoring
Merge branch 'master' of github.com:fryingpan/Assignment2