30.04.13 19.44

refactoring #2