Merge pull request #13 from Negusbuk/master

various cleanups and cosmetical interventions