Add FrameLabel support
Merge pull request #188 from raggy/master

Add FrameLabel support