fixing issue #1 and v 0.2.2