Improved a bit
Issue #13