Refactoring.
Merge branch 'develop' of https://github.com/figa12/sw606f13.git into develop