Team2 wonderful code added.
Merge pull request #8 from MoMaT/master

Team2 wonderful code added.