Merge pull request #1 from igop/master

Added data from igop.
Add some new ideas and modification.