[LMAG] Shape component
Merge pull request #23 from michalbe/dev

[LMAG] Shape component