Merge pull request #1 from RossKinsella/alex-dev

Alex dev
merge from master