R & L
Merge branch 'hotfix/0.1.1'