working condition
Merge pull request #13 from buckyoung/andrew

working condition
merged