Strucuture refresh.
Merge pull request #2 from andtxr/2.5

Strucuture refresh.