Fixes #9, Fixes #6, See changelog or issues.

Signed-off-by: devxdev <xdev@devxdev.com>