Merging Changes made on the evolution repo back to your original

Hi @mihanik71,

I made some changes to your plugin over on the [MODX Evolution repo](https://github.com/modxcms/evolution) and figured I'd also send you a pull request too.

The issues addressed here are [issue #174](https://github.com/modxcms/evolution/issues/174) and [issue #308](https://github.com/modxcms/evolution/pull/309).