Merge pull request #2 from drphitheta/master
merging again