Merge pull request #8 from ohmage/work_with_3.0

before move to 3.0
Merge remote-tracking branch 'upstream/master' into work_with_3.0