Revert "Revert "1st commit 20131218""

This reverts commit 01b66d1933ab7a2c166241e49475296ef37e5752.