fixed #16 & #17
Merge remote-tracking branch 'origin/master'