dtoubelis - 2014-01-26

Please scratch patches 0001 and 0002. It seems not the best approach.