Merge pull request #8 from pianoslum/master

Various small fixes