Fixing issue three and four

https://github.com/Mobilpadde/ManExt/issues/3
https://github.com/Mobilpadde/ManExt/issues/4