finishing touches
Merge pull request #15 from buckyoung/andrew

finishing touches
merged