bugfix3
Merge pull request #87 from colinsulin/gh-pages

bugfix3