proposal for minor changes
Merge pull request #1 from @liob
Compiled changes