Refactored
Merge pull request #2 from amdziuk/FramedData

Refactored