May fixed issue #175
Merge remote-tracking branch 'famous/master'
Fix issue #180
Merge branch 'master' into inuse