Merge pull request #71 from alfeko/master

Master update
Merge pull request #75 from alfeko/peterbranch

Merge pull request #71 from alfeko/master