issue 50
merged with master
issue 44
issue 41
merge master and receipt
adjustment to receipt model