Test
Commiting to pull
Comitting to merge
Basic style changes for errors added
Merge branch 'paul'