Disappearing after test
#15 Fixes disappearing bug
Merge branch 'master' into tests