commit
Merge branch 'master' of https://github.com/WilhelmKaiser/FoLT2014.git
Signed-off-by: WilhelmKaiser <ziyang.li.nk@gmail.com>