version 16042014: a lot of bugs fixed!