Changes in structures
Merge branch 'master' of github.com:naio/Robbie