Bugfixes en performanceverbeteringen
Merge branch 'master' of github.com:mpoelstra/na