Fixes #2 Removes unsafe code