Closes #2

Also fixed build error on new checkout