Master Change 3

This should fix #1