margin comments initial
perhaps fixed an NPE
first working version
removed debugging statements
Merge branch 'marginComments'
adjusted build scripts
updated build scripts