Merge pull request #19 from confpub/master

 	update, mainly for the paperless sessions