fixed: "." used for regular expression
fixed: possible null pointer dereference
Merge pull request #35 from beckchr/master

Fix some FindBugs issues