Merge pull request #61 from maverickmishra/master