Modified several methods

seems to be functional right now
Merge branch 'master' of https://github.com/yiyi28/MaekawaAlgorithm