#70, #69, #68, #59, #40
bug fix.
#61,#58
remove console.log.
Merge pull request #71 from fotavo/bug-fix

#70, #69, #68, #59, #40
Fix conflict.