Updated to DAIS'14 submission