error checking
merging
merging master