Merge pull request #63 from alfeko/master

Updating with master