Version 1.1 2017.09.25
Fixed some bugs