Various improvements
Merge pull request #1 from mawrkus/various_improvements

Various improvements