Issue #1 is closed + some more improvements