Updated for github
Merge pull request #1 from poeli/master

Updated for github