package name fixes
Merge pull request #27 from littleli/master

package name fixes