addition 1 and 2
delete addition 2 for now
Merge pull request #1 from satoso/dev

addition 1 and 2