Bumped version to include #1 and #2