Beta 1.0.2 - Small changes