Code review
Merge pull request #1 from kasperg/review

Core code review
Reviewed: Fixed minor issue found during core review
Merge branch 'development' into release