Added some new features/bug fixes for 1.0.2.