Sunday merge pm
commit
test
merge from david
merge from david2
david changes
Merge pull request #5 from Dseiav1/master

David's changes