version 21042014: a lot of bugs fixed!