Fixed #333
Merge branch 'overlap' into grunt
Added zipping to Grunt