Version 2

Update : Bug Fixes and Improvements