05-12-2014 v2
Merge https://github.com/ar31mr/test
05-12 v3