Merge pull request #9 from Vandenn/master

Pull
Fixed NullPointerException
Merge pull request #2 from yaojohnpaul/master

Fixed NullPointerException