Some improvements
Merge pull request #1 from patriknw/wip-improvements1

Some improvements