updated documentation and error messages
added macros to source
macro integration
updated comments
replac
Merge branch 'replace-buildfile-with-beacon'