#1281
closed #1306
#1281
#1281
#1281
closed #1294
=)
closed #1293
fix small bugs
Merge branch 'dev' of https://github.com/yupe/yupe into dev
#1281
#1281
#1281
closed #1278
started #1220
fix tests
closed #1318
fix test data
closed #1317
closed #1316