Cleaned up code to eventually add support for stuff listed in the TODO part of the README, updated README, bumped version.