Merge pull request #81 from ctiller/update

Merge master into branch