resolving #6 and #12 plus a small Gruntfile fix

#6 
#12