Merge pull request #1 from DocOnDev/features

Features
fixed broken tests
Fixed tests.
Merge pull request #1 from mlutton/features

Features