Only minor changes and simplifications
Merge pull request #1 from xyproto/master

Only minor changes and simplifications