Fixed issue 14: thanks Yang
Merge branch 'master' into mavenize

Update from upstream.