2014.4.17

maybe the final version before debugging