Updating to newest files, which resolved issue #22