Some things from issue #1
Some things from issue #1