Bug fix and bump to version 1.0.2