cleanup
added whitelist for name checks, fixes #28