Merge pull request #24 from vkarthik26/master

Multiple changes. All detailed in respective commits.
Showing off sexiness
Removing unnecessary "BOOM"