OS X support added
asm #2 report added [50% of complete]
merge branches