Refactored option order and data passing
Bumping version to 0.0.5