Made small changes
Merge pull request #26 from wildewouter/smallFixes

Made small changes