Adding features and fixes for 0.9.5 release coming soon