Final commit for 0.5.1
Final commit for 0.5.2