1.0 Beta 4 - Fixes #32