2014.1.6

fixed some bugs