2014-10-13

Improved code