Refactor
Remove upgrade stuff from repository
Merge pull request #58 from longility/master

Refactor