0.3.2.1

-Minor changes and bug fixes