Lots of changes here and there
Merge branch 'master' of http://github.com/pranavashok/magar