Version 1.0.1 with bug fix