Fix for issue one and five

https://github.com/Mobilpadde/ManExt/issues/1
https://github.com/Mobilpadde/ManExt/issues/5