some bug fixes (for new production and analysis using grid)
Merge pull request #18 from anehrkor/master

some bug fixes (for new production and analysis using grid)