nromanen/ch018-2team- — pull request #25 by etenzor (2014-01-11 00:00:45+00:00)
Title: Merge pull request #24 from nromanen/master

master->edd(11.01.2014_3)