Minor changes and bumped to version 0.3.1