Fixes #13 && #12

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