cleanup for yesterday's fixes
Merge pull request #6 from elenasa/master

cleanup for yesterday's fixes