fixed issue #12 where setInputMask to null caused NPE
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
fixed a compile error on JDK8u11