many things in one
Merge pull request #8 from diN0bot/mixofchanges

many things in one