28102014

fixed bugs