Fixes #2 Fixes #3 Look at issues for more details