Merge pull request #98 from rackspace/master

Multiple features, enhancements and bug fixes