Some changes
Merge pull request #9 from GrahamHouse/new-dev

Some changes