version 31042014: a lot of bugs and features solved!