Merge pull request #1 from ebryn/master

Update mine
Sorry: I wanted to merge the master into mine (how can I undo this merge pull request). Need to say, I am pretty new to GitHub