improvment proposals
Merge pull request #19 from sclassen/improvments

improvment proposals