Merge pull request #69 from alfeko/master

Master update