Fixes #3 , Fixes #2 - major changes