@: Sat May 10 13:43:20 EDT 2014
Merge branch 'master' of github.com:sigma-random/test