Fix for #50, also updated grunt tasks