fix #2
fix #3
fix #4
Merge branch 'hotfix'
Merge branch 'patch-#4'
Merge branch 'patch-2'