v0.1.1 - Bug Fix, Optimization