removed unused import
Merge remote-tracking branch 'upstream/master'
fixed indent
added checks for invalid vendor.id or name attributes from properties file
Merge pull request #2 from warhog/master

some minor enhancements