Merge pull request #23 from Negusbuk/master

various fixes