Refactor (Michael)
Michael refactoring
Merge remote-tracking branch 'upstream/master' into working
Merge pull request #182 from andhieka/working

Michael Refactoring