* Removed duplicate function causing a fatal error.

fixes #1.
Merge fixes from both Bitbucket and GitHub