update, mainly for the paperless sessions
Merge remote-tracking branch 'upstream/master'
Merge pull request #19 from confpub/master

 	update, mainly for the paperless sessions