Integrated version
deleted extra file
Merge pull request #2 from zlu883/master

Integrated version