No more lazy properties :(
Make use of a register decorator
Merge branch 'develop' of https://github.com/icereval/waterbutler into develop