Merge pull request #157 from NeoSephiroth/excel

Excel
minor
refactoring
refactoring
Merge pull request #2 from yatsdev/excel

Excel