Fixed #1 Fixed #2 and bumped version