a bit of automatization
Merge pull request #12 from Mendor/master

a bit of automatization