Git Issue #80
Merge branch 'master' into holyprin