further contributions improvements
Merge pull request #89 from xithan/master

further contributions improvements