#185: committing for backup
#185
#185
fixed a lot of merge issues
refactored a package
reomved unused imports
removed more unused imports
Merge pull request #218 from rhsu/matrix

Matrix