Minor changes + bugfixes
Merge pull request #1 from wagnert/master

Minor changes + bugfixes