added timeout
added logging history
removed logging
removed redundant conditional
Merge branch 'master' of https://github.com/np1/pms