Merge pull request #1 from copenat/Ninad

Testing branching and pull requests
Merge branch 'master' into Ninad-20140618