Edited branch, fixes#1

Some some