method body removed as field
construction structure fixed
Merge pull request #13 from vapolyakov/master

Small reorganization