full rewrite for best design practices
bugix: typos and quoting
Merge branch 'hotfix/0.1.1'