working version 0.001
Merge pull request #1 from abditag2/develop

working version 0.001