rkipp1210 Merge pull request #12 from yhat/cleanup