cleanup
Merge pull request #3 from icro/master

cleanup
Merge remote branch 'upstream/master'