fixed #3
fixed #1
fixed #4
Merge branch 'bugFix'