Better naming and improved docs
Merge branch 'master' of github.com:lelylan/lelylan-ng