resolves #1, asdfasdf
Merge remote-tracking branch 'origin/GH-2' into GH-2