general improvements
Merge pull request #97 from Golpha/imp

general improvements