This is for recent changes until 26June2014-1520
Merge pull request #5 from ypwalter/26June2014-1520

This is for recent changes until 26June2014-1520