bugifx about #96
bugfix about #95
Merge pull request #97 from pubannotation/bugfix_20140630

Bugfix 20140630