Update on 9-10-2014

Test some new formulas, try to improve somethings