Added grunt, fixes #4, fixes #5