Merge pull request #205 from JonasNorling/master