fixed #18
fixed #17
fixed #16
updated installer
Merge remote-tracking branch 'origin/master'