better separation
Merge pull request #7 from pinhopro/master

better separation