Merge pull request #88 from jkuk/master

implementing budget tables
Fixed for new constructors
Merge pull request #89 from WannabeSid/master

Fixed for new constructors
minor fix