Merge branch 'master' into housekeeping
Merge branch 'master' into housekeeping
Merge pull request #47 from LocalData/housekeeping

Housekeeping -- done @prashtx