conflicts fixed between master and hmu/api_comments_clean
Merge pull request #23 from SIMS-Topaz/hmu/api_comments_clean

conflicts fixed between master and hmu/api_comments_clean