Version 1.0.1: Fixed some bugs