Merged in default (pull request #13)

Add accessor functions for flag and drop useless flag macros

Approved-by: Gary Kramlich