simplify everything
Merge pull request #2 from shama/new

simplify