25052014-1

bug 25 fixed ( in the last Commit )