2014-12-03:

Some improvements