Various changes
Merge pull request #40 from tanskanm/master

Various changes