bhalothia/lakshmi — pull request #3 by bhalothia (2014-01-24 10:59:04+00:00)
Title: Merge pull request #2 from bhalothia/master

merging dev with master